bitkeeper revision 1.1596 (429b3fa2RgeJZgQIRrT4oHa-PKg4zg)
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Mon, 30 May 2005 16:30:26 +0000 (16:30 +0000)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Mon, 30 May 2005 16:30:26 +0000 (16:30 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk


Trivial merge